From faed5298bd7cd946919c1e352e5d5f72bf9b0ec3 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Sun, 9 Jul 2006 07:50:44 +0000 Subject: [PATCH] Release the pool in all cases. (move_resize_window_internal): Surround by 2006-07-09 Richard Hult * gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool in all cases. (move_resize_window_internal): Surround by alloc/release pool. Patch from Brian Tarricone, fixes bug #347018. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk/quartz/gdkwindow-quartz.c | 10 +++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c43ab31e2..2c72807cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-09 Richard Hult + + * gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool + in all cases. + (move_resize_window_internal): Surround by alloc/release pool. + Patch from Brian Tarricone, fixes bug #347018. + 2006-07-08 Matthias Clasen * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c43ab31e2..2c72807cbb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-07-09 Richard Hult + + * gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool + in all cases. + (move_resize_window_internal): Surround by alloc/release pool. + Patch from Brian Tarricone, fixes bug #347018. + 2006-07-08 Matthias Clasen * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 536dc1678f..3023e379fd 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -370,6 +370,7 @@ gdk_window_new (GdkWindow *parent, break; default: g_warning (G_STRLOC "cannot make windows of type %d", private->window_type); + GDK_QUARTZ_RELEASE_POOL; return NULL; } @@ -659,8 +660,13 @@ move_resize_window_internal (GdkWindow *window, GdkWindowObject *private = (GdkWindowObject *)window; GdkWindowImplQuartz *impl; + GDK_QUARTZ_ALLOC_POOL; + if (GDK_WINDOW_DESTROYED (window)) - return; + { + GDK_QUARTZ_RELEASE_POOL; + return; + } impl = GDK_WINDOW_IMPL_QUARTZ (private->impl); @@ -698,6 +704,8 @@ move_resize_window_internal (GdkWindow *window, [impl->view setNeedsDisplay:YES]; } } + + GDK_QUARTZ_RELEASE_POOL; } void -- 2.30.2